]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
Add explicit x11 dependencies
authorRico Tzschichholz <ricotz@t-online.de>
Tue, 22 Feb 2011 18:34:52 +0000 (19:34 +0100)
committerOwen W. Taylor <otaylor@fishsoup.net>
Wed, 23 Feb 2011 15:57:04 +0000 (10:57 -0500)
Since Ubuntu patches clutter-1.0.pc to remove x11 from the requires,
we have to list it explicitly for places we use X11 functions, like
ST and the shell recorder.

https://bugzilla.gnome.org/show_bug.cgi?id=643003

configure.ac

index 78debf20a32f90c2cc7ab95851d6d6d7529bf224..c3dc6397e03b81ea01f774c2b605a932ceb3ddd3 100644 (file)
@@ -52,7 +52,7 @@ AC_MSG_CHECKING([for GStreamer (needed for recording functionality)])
 if $PKG_CONFIG --exists gstreamer-0.10 '>=' $GSTREAMER_MIN_VERSION ; then
    AC_MSG_RESULT(yes)
    build_recorder=true
-   recorder_modules="gstreamer-0.10 gstreamer-base-0.10 xfixes"
+   recorder_modules="gstreamer-0.10 gstreamer-base-0.10 xfixes x11"
    PKG_CHECK_MODULES(TEST_SHELL_RECORDER, $recorder_modules clutter-1.0)
 else
    AC_MSG_RESULT(no)
@@ -102,7 +102,7 @@ AC_CHECK_FUNCS(JS_NewGlobalObject sn_startup_sequence_get_application_id)
 CFLAGS=$saved_CFLAGS
 LIBS=$saved_LIBS
 
-PKG_CHECK_MODULES(ST, clutter-1.0 gtk+-3.0 libcroco-0.6 gnome-desktop-3.0 >= 2.90.0)
+PKG_CHECK_MODULES(ST, clutter-1.0 gtk+-3.0 libcroco-0.6 gnome-desktop-3.0 >= 2.90.0 x11)
 PKG_CHECK_MODULES(GDMUSER, dbus-glib-1 gtk+-3.0)
 PKG_CHECK_MODULES(TRAY, gtk+-3.0)
 PKG_CHECK_MODULES(GVC, libpulse libpulse-mainloop-glib gobject-2.0)